tests: load required version of Clutter/Gtk early

diff --git a/tests/interactive/background-repeat.js b/tests/interactive/background-repeat.js
index 3e1c869f6e5567758502348bb14880d71dbea4c5..2b83411c4129085defcc32b516de897cf353c76b 100644 (file)
--- a/tests/interactive/background-repeat.js
+++ b/tests/interactive/background-repeat.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

diff --git a/tests/interactive/background-size.js b/tests/interactive/background-size.js
index f803260b1b50bf4de35bbe7b5f993d069541fca2..e313269779d42f93469e51b4d0521074841a5907 100644 (file)
--- a/tests/interactive/background-size.js
+++ b/tests/interactive/background-size.js
@@ -1,10 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Cogl = imports.gi.Cogl;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
 
 function test() {
     let stage = new Clutter.Stage({ user_resizable: true, width: 1024, height: 768 });

diff --git a/tests/interactive/border-radius.js b/tests/interactive/border-radius.js
index 865c512bf5fc2e06f6126dd22a20826d9c85f5af..3b7d3d306cea641e0e155edc7d22d78ab430f453 100644 (file)
--- a/tests/interactive/border-radius.js
+++ b/tests/interactive/border-radius.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

diff --git a/tests/interactive/border-width.js b/tests/interactive/border-width.js
index 4ac118c94e0d7fa55c6235597e9c68029900c242..cb84187e09838b5e5ecbb7ddda33f05ccf43bdc9 100644 (file)
--- a/tests/interactive/border-width.js
+++ b/tests/interactive/border-width.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 97d049d50d902122be89fda6704e011356a3262c..23212e4fb03ca96d3b81aa2492b5bda071c64a32 100644 (file)
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

diff --git a/tests/interactive/box-layout.js b/tests/interactive/box-layout.js
index 36460f84731f5be6d578078d840ef8355ae5f6b8..5eb83a46be546aa67188637f811ae5c2658c3c7f 100644 (file)
--- a/tests/interactive/box-layout.js
+++ b/tests/interactive/box-layout.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

diff --git a/tests/interactive/box-shadow-animated.js b/tests/interactive/box-shadow-animated.js
index 2dc7ceae3e7e3ca152000681c5e3881c51800ea0..a334c38f9ffbd6db1ed23b6637c9382d7d30df22 100644 (file)
--- a/tests/interactive/box-shadow-animated.js
+++ b/tests/interactive/box-shadow-animated.js
@@ -1,13 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Mainloop = imports.mainloop;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 
-const UI = imports.testcommon.ui;
-
 const DELAY = 2000;
 
 function resize_animated(label) {

diff --git a/tests/interactive/box-shadows.js b/tests/interactive/box-shadows.js
index e80cb1b75d8187fa89295100b74e161d839eab20..4a14df1c98df5c8b0839f21c7f9f503e4761a597 100644 (file)
--- a/tests/interactive/box-shadows.js
+++ b/tests/interactive/box-shadows.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });
     UI.init(stage);

diff --git a/tests/interactive/calendar.js b/tests/interactive/calendar.js
index 18db193487adc9f6923876be820125da7fce5571..a54b562d5022f41d12dc3d9956d9aeae363ce48c 100644 (file)
--- a/tests/interactive/calendar.js
+++ b/tests/interactive/calendar.js
@@ -1,11 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
-const UI = imports.testcommon.ui;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

diff --git a/tests/interactive/css-fonts.js b/tests/interactive/css-fonts.js
index 89af667048f5d1f838d5423cfcccdfd9013bff11..56c19055da15d7b27aa4069a3a2542c0da476b96 100644 (file)
--- a/tests/interactive/css-fonts.js
+++ b/tests/interactive/css-fonts.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

diff --git a/tests/interactive/entry.js b/tests/interactive/entry.js
index df93676f743220b96400dbafa51517d7663e7f5c..35c4f1184784e9813b8b1b22f11dfb724b5a82f8 100644 (file)
--- a/tests/interactive/entry.js
+++ b/tests/interactive/entry.js
@@ -1,11 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
-const UI = imports.testcommon.ui;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

diff --git a/tests/interactive/icons.js b/tests/interactive/icons.js
index 64cf898d1cb19104c7b5277f74e260faa0750c53..39ef09e6bafae0d1306bfd4b32837c3f977babd9 100644 (file)
--- a/tests/interactive/icons.js
+++ b/tests/interactive/icons.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

diff --git a/tests/interactive/inline-style.js b/tests/interactive/inline-style.js
index b8fe9aaffe1095ea6507a05d90f0d0428a74f7da..1bd35f9f86550d8ba4f68ee81069ae78374c5c49 100644 (file)
--- a/tests/interactive/inline-style.js
+++ b/tests/interactive/inline-style.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js
index a6d09ea813b202c15974b223aa2c229aa8f0a29d..d8c6fdc9e32aff701a4478961ccb74757d80b95a 100644 (file)
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@@ -1,13 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 // This is an interactive test of the sizing behavior of StScrollView. It
 // may be interesting in the future to split out the two classes at the
 // top into utility classes for testing the sizing behavior of other

diff --git a/tests/interactive/scrolling.js b/tests/interactive/scrolling.js
index 1c3964607bc6a69ed75dd38a9674a9d533587d31..ca84fe90b1bcbc526dc8689284876a495f6bc868 100644 (file)
--- a/tests/interactive/scrolling.js
+++ b/tests/interactive/scrolling.js
@@ -1,11 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

diff --git a/tests/interactive/transitions.js b/tests/interactive/transitions.js
index 6855a5f6a21af42cee03d153142e4cbfe9ce8c8d..acb5db479308266e4ecb6ec969a3bec8d113d1a1 100644 (file)
--- a/tests/interactive/transitions.js
+++ b/tests/interactive/transitions.js
@@ -1,10 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const UI = imports.testcommon.ui;
+
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const UI = imports.testcommon.ui;
-
 function test() {
     let stage = new Clutter.Stage();
     UI.init(stage);

diff --git a/tests/testcommon/ui.js b/tests/testcommon/ui.js
index b66b0cdcaea4b9133d5ffc83dcaf9cb3f978ec0a..51c136a399b7aef64a0b1d0a7c8ad5cbc366d512 100644 (file)
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@@ -1,5 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Config = imports.misc.config;
+
+imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
+imports.gi.versions.Gtk = '3.0';
+
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;